From adc731fad922cb62f982fd753104bfd4365d02aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Nov 2011 07:08:53 -0400 Subject: [PATCH] Remove various internal uses of deprecated api --- gtk/gtkaboutdialog.c | 2 +- gtk/gtkcolorsel.c | 11 ++++++----- gtk/gtklinkbutton.c | 13 +++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index aaa82fbb77..6d916b61d3 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -2113,7 +2113,7 @@ text_view_new (GtkAboutDialog *about, size = pango_font_description_get_size (gtk_style_context_get_font (context, state)); font_desc = pango_font_description_new (); pango_font_description_set_size (font_desc, size * PANGO_SCALE_SMALL); - gtk_widget_modify_font (view, font_desc); + gtk_widget_override_font (view, font_desc); pango_font_description_free (font_desc); gtk_text_view_set_left_margin (text_view, 8); diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index d66067209b..32f18ce715 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1352,13 +1352,14 @@ palette_set_color (GtkWidget *drawing_area, gdouble *color) { gdouble *new_color = g_new (double, 4); - GdkColor gdk_color; + GdkRGBA rgba; - gdk_color.red = UNSCALE (color[0]); - gdk_color.green = UNSCALE (color[1]); - gdk_color.blue = UNSCALE (color[2]); + rgba.red = color[0]; + rgba.green = color[1]; + rgba.blue = color[2]; + rgba.alpha = 1; - gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, &gdk_color); + gtk_widget_override_background_color (drawing_area, GTK_STATE_FLAG_NORMAL, &rgba); if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (drawing_area), "color_set")) == 0) { diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index f0724275bb..f17be71473 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -307,6 +307,7 @@ set_link_color (GtkLinkButton *link_button) { GdkColor *link_color = NULL; GtkWidget *label; + GdkRGBA rgba; label = gtk_bin_get_child (GTK_BIN (link_button)); if (!GTK_IS_LABEL (label)) @@ -327,10 +328,14 @@ set_link_color (GtkLinkButton *link_button) link_color = (GdkColor *) &default_link_color; } - gtk_widget_modify_fg (label, GTK_STATE_NORMAL, link_color); - gtk_widget_modify_fg (label, GTK_STATE_ACTIVE, link_color); - gtk_widget_modify_fg (label, GTK_STATE_PRELIGHT, link_color); - gtk_widget_modify_fg (label, GTK_STATE_SELECTED, link_color); + rgba.red = link_color->red / 65535.; + rgba.green = link_color->green / 65535.; + rgba.blue = link_color->blue / 65535.; + rgba.alpha = 1; + gtk_widget_override_color (label, GTK_STATE_FLAG_NORMAL, &rgba); + gtk_widget_override_color (label, GTK_STATE_FLAG_ACTIVE, &rgba); + gtk_widget_override_color (label, GTK_STATE_FLAG_PRELIGHT, &rgba); + gtk_widget_override_color (label, GTK_STATE_FLAG_SELECTED, &rgba); if (link_color != &default_link_color && link_color != &default_visited_link_color) -- 2.30.2